image: Don't assume baseline parameters are non-NULL

The GetSize callback *can* assume that minimum and natural are
non-NULL. Buy minimum_baseline and natural_baseline can and
will be NULL, so handle that. This was causing crashes e.g. in
pavucontrol.

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index c9b454c7376b4e2a68fd5073b4cefcdd636e1715..f9bd7e15eb54af49a56d846ef1f918f3c6a096ee 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1694,7 +1694,10 @@ gtk_image_get_content_size (GtkCssGadget   *gadget,
     {
       baseline_align = gtk_image_get_baseline_align (GTK_IMAGE (widget));
       *minimum = *natural = height;
-      *minimum_baseline = *natural_baseline = height * baseline_align;
+      if (minimum_baseline)
+        *minimum_baseline = height * baseline_align;
+      if (natural_baseline)
+        *natural_baseline = height * baseline_align;
     }
 
 }